More events around saving, bug fixes