Finish up most of the minor tweeks. This should be one of the final commits on this project.