re-design waterfall mode

fixed some bugs