map and rotation bug fixed