added enhanced logging and time out adjusts