Addressed most of Mont's suggestions

About 1 page worth of corrections remains, as well as a minor change to the
figure and a few others.