Cleaned up some copy, need to start a branch for the rest of this work.