Continued working on the camera and made some smaller modifications to the superclasses as well