all modals should wait on success, and a few other tweaks