Fix problem where balloon would temporary appear in the wrong place.

This is kind of a hack and needs to be cleaned up.
Merge branch 'balloon' into uberbranch