some housekeeping edits and a few additions