Bugfixes
- map fix
Code improvements