Delete some stupid placeholders
Bugfixes in map part