small things
a few tests

also, changes to debugging things that shouldn't be in the repo anyway