Bug fixes, incorporating camera