Comments
Add debug info on map
Bug fix on map cursor