changes to camera, fixed some bugs