Mass update of some files that Ross has mostly been workingo n