updates for better watchdog support.
merge
library tagged.