fixes #10, #11. And shows the map again :D
Remove todo