Added extra file, further corrections. This should be the definitive version