Bug fixes galore. Remind me to finish the camera fix