More work on camera, rotation added