Some edits
Made branch up to date.