Changed timeouts to prevent problems when closing, changed logs