Map fixes for regular users.
Bugifxes, fixes for #115.