fix units, add variable file extensions