Many long overdue edits with more to do