Final code changes. Probably the last commit officially working with
the NCSA.