Edits, better equations, typo fixes