I've added a map and a walkthrough to the Water Temple. The walkthrough takes you from the very beginning, and leads you to all the treasures. If you were completely puzzled by the Water Temple, this should help you out!
Hello all. For anyone who's interested, I've added a complete map/walkthrough of the final boss's lair. Outside of the obvious, I've tried to minimize spoilers. So if the last lair is driving you nuts, go check out the maps!