Finished the constants and removed old magic numbers
Fixed up events and added functions for them