- new map base
- some code corrections