Messed a little more with Wave Math