Make some changes based upon Craig's suggestions.