[waves] tweaks and more options