fixed fatigue date calculation, simplified many functions