and fix issues not updating or deleting things at wrong times