Bugfix and cosmetic improvements
Camera Bugfix, clean-up, debug info added