More wave generation updates