Changes to deal with new data source. Minor bug fixes and label changes