Minor changes to wave, corner-split..