saving works, notifications fixed