Cleanup and prevent confusion!
Updated Events. Special thanks to @DarkAngel39