fixed accidental commenting-out of large parts of wop.c
trivial whitespace changes