formatted some of aarons sections nicer
merged zijians comments and my edits