More modifications and improved logging. Watchdog Timer implemented