Tidied up data file, merged master. All tests passing.