+ diagnostic
+ bugfix
+ bugfix of deathWatch