Controller wording updates

with a few other random fixes - Most of these were straight from Julian
Leviston