Fixes and camera addition to organize