Incorporated Evan's changes. Blue is stuff I change (most of the stuff I
cahnged). Red are questions.