small cleanups, wave still not working

* seems like the matrices are constructed properly, have to revise the
iteration and other related stuff