less debug output
commit lots of work in a single commit! yay!