Improved timeouts; fixed major update bug