Please forgive the shameless self-promotion, but
GURPS Fantasy Folk: Elves (which should be out VERY soon) has a new rule or two dealing with things underwater, and complies a few others you won't find in the
Basic Set.
And an excellent resource is
http://www.warehouse23.com/products/...ter-adventures