tests!

fix a few things too