More additions and edits