Added label columns, some name edits