Updated Notififer and General Cleanup