Better
Maps not movable.

Bugfix and cleanup.