fixed a small bug on map manipulation, manipulation have now been tested and it work, performance is surprisingly good