improved/fixed notifications system