Various revisions and cleaning up.