Camera Improvements

Hopefully, the drawer methods will work better.