Added a camera option

Also a couple minor optimizations.