Merged Ben's changes.. fixed camera shake bug