Minor adjustments

Sorry for all of the commits.