wave overlay, misc cleanup