fixes #5 (by way of a data set) and fixes #9