fixed #16, some map changes
(small) bunch of messages