Minor changes -- making pull request mainly to try doing so