Add a small diamonds data set
Go back to scales with zero by default
Fix error handling