Lots of bug fixes including getting notifications working