Add option to show map
Bugfixes