Fix wave generation with hard coded values

Closes #21
Closes #20