camera shake, misc tweaks and cleanups