fixing waterfall animation, and color