Add a bunch of fine tunings that Reid contributed. Thanks Reid!