notifications cleaned up, fixed #25