Made Hugh's language changes
Fixed some of Adam's changes