Mostly doc fixes; some validation