some notify optimizations and minor fixes
some notify optimizations and minor fixes