Completed task #25

also fixed some bugs with the crosshair