As for the water, possibly just drop the opacity a little?

With the key, is this a player handout at the table? If so I'd avoid a key because that can give away the contents of your dungeon.