Cleanup in preparation for splitting engine away
Fixed camera wrapping problem.