Add wave and improve wind