Little cleanup and camera stuff