changes to whitespace and turn off some debugging