Changed minor things, fixed CrossbowCrash, and cleaned up