Removed the warnings from Nigel's code. And added our names to the files that I just changed as per Nigels spec.
merges