added map, and camera stuffs