a few additions and edits