Cleaned up some stuff

general cleaning
Fixed camera going too far off screen