Minor changes
Time to split out the camera work