Few fixes to calendar weekly shifts
Added watchfire export with spec