Improvements in several modules

Some modifications/improvements I've made to suit my needs.
BTW... nice notification framework ;)