Improvements to ice splash.
Merge branch 'improve_splash'