data munging and arg order fix

This fixes #13 and also resolves #8, albeit in csv form.