Fixes TODOs and adds watchdog support