Wheeeee cleaner code
Re-enabled watchdog