Various additions and edits