More edits, added most of the results