Bugfixes
Implemented Map