First implementation of notifications, some more tweaks as well