Added preFactor and commented more