Evnt Updts

Last update failed to include work I did, and was forced to redo. This
update should include ALL the changes I made this time.