Fixing the map, adding animations