timeFactor changed to timeStep, minor useless changes
minor fixes