more changes to camera and player rendering
fixing some merge issues