better style
revert a whole lot of debugging stuff
Merge branch 'master' into logan