Still have done very little due to the foot injury - I'm convinced at this point that it's just an overuse injury. I'm pretty sure it was brought on by the 10-12 hrs on my feet at the Relay for Life last weekend (coupled with all the other stuff in weeks prior). I've been resting and icing it. I've tried to keep as much weight off of it as possible - and it's been feeling better day by day.
This morning I got up early and went to the pool. It was a short swim (gotta get a new nose clip). I did about 4 laps of warmup, then swam 5 x100 repeats - so about 600 meters total.