major cleanup, camera movement