Fixes to Saving and EventHookContainer

Fixed issues in recent saving changes. Also made some minor changes to EventHookContainer.