small clean-ups, doc. block fixes