Forgot CSAT and FIA Units

And a brief tidy up!