Minor edits; getting ready for some refactors.