quantities, dirty, re-fixes #7