Minor cleanup
Lazy loading, fixed camera, more cleanup