some minor improvements and the data set included