minor changes in calcfactors