Various fixes. Reverting to raw printing of help text for the time being.