More cleanup and working camera