Fixes and startup-notification - Alex