Calendar issues & incorrect calculation of completion