comment out some debugging, fix whitespace