changed crosshairs to circle
bug fixes and reorganizing