Bugfix

-Fixed the last of the g++ compilation errors
-Tweaked the water shader