data munging and arg order fix