Rich's fixes to the files