Commit
various edits