Fixed paths
Improved water prototype