Watchdog, a bugfix and current control improvements