Bugfixes in installation and Map