removing debugging comments
notifications are borken, added todo