rebase to most up to date version
updated wording from Edwin's edits
added edwin's changes. still need to columnize about page