A lot of manual description edits & renaming