trying to redo some labels,  pushed edits from Darin through