Updating: tidying for moving changes into ats2-lang.
Updating; very minor fixes