Some minor changes before making bigger ones.