Repaired some refactor issues, main digest bug on sortFields still here though
More completely useless changes that might be better