Rename collision events to those used by convention.
Moved updated even handler to be included in the base constructor for units
Removed extra code, added more comments