Minor fixes; leftover debugging stuff, comments and minor additions.