Still some work to do, but feeling fit this summer