final read through and a last set of small changes

Benjamin Mako Hill || Want to submit a patch?