Doubleofive I must say your new avatar has succesfully reinvented itself to show the new take on secret agents...hehehehe. way cool.
On Bespin....I say take away the merry-go-round-ish thing...it looks silly... it could have been a gas mine or a glorified Vegas for that matter, the thing is move the story to "neutral location" where they don't suspect to be jumped by Vader.