Incorporated Josh's edits.
Added my own edits.