Addendum: Trek is saying the water in the BB is normal wear and tear and that after riding in the rain, I need to take off the seat post and turn the bike upside down to let the water drain out since that is where it is entering from during a rainy ride. So they are trying to not cover the BB under warranty. The LBS is fighting it for me though. FYI and not directly relevant to my maintenance questions above.