Hi Jeff, Yes, you need 'of', not 'to'. Yes, if 'water' is the subject, the verb should be 'makes up'. 'Water' is usually treated as uncountable, but not always when we are speaking of large bodies of water.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.