Also fix error in dimension ordering for non-swapping case.
Also change spatial and temporal units to use long form.
