Fixed waterfall assert and also made them look a bit better.