Allow close without saving; various tweaks