Fixed Default wave mode

and some comments