Final notfication bug fix

Sorry for all the crazy commits but this branch and commit has everything you will need to merge.