Disable waterfall ZOOM and switch long names
Fix several issues on waterfall