Fixed camera functions

My branch was 13 commits behind the main one, so hopefully it doesn't delete your edits.