Camera work and other minor fixes
merge commit