Here's a great site if you haven't found it yet to keep track of your exercise, water intake, calories and fat and a few other things.  It's free too!

myfitnesspal.com