Additions and edits