Last improvements for waves