Streamlined event system, added hitboxes