Minimum calibration time set to 3 seconds.
Cleaned a method up.