Always have someone watching you when you do this stuff first off. Usually if guys work on their running/cardio also add Jodie/singing outloud, it will really help your underwaters. Also work on your stroke, you should be able to get across a 25m pool in less than 6 strokes. You can also use co2 tables.
