Some minor tweaks after a complete pass of the paper