Fixed issue with timers

Also added timeouts to logs