Improve camera

Also fix some minor warnings due to typos (missing // between #endif and commentary)