Wave improvements + shortcut.