Renamed settings variables and added some
More tidying settings variables
Name changes
Added USE_WINDOWS macro
Progress on loadDataset()
More progress on loadDataset()