renaming some attributes, improving editing