notification and other improvements ...