Added notification actions, fixes, improvements