Adding more waterways

Adding more waterways + minor updates