Stopped camera jittering
fixed a merge