changes to noti and other good stuff