Misc bug fixes and notifs

Merged
KI
1y ago
+171-136

Misc bug fixes and notifs