probs fixed the error:

calculateDiff mishandled sunday (==6) -> monday (==0) step
clock prettify does now hours too