minor changes and watchdog updates