Renamed some variables. Added fields to test data set. Minor improvements