fixing stuff on maps
last commit for 1.0