added water effect and moved cubes setup code
minor improvements