Documentation fixes, Camera model changes to allow camera-associated objects.
(PONIES!)
Fixing merge issues.