minor style changes / kill some debugging stuff
fixes #221 #222 #223 #225