Seems ok to me, do you want to change anything on the timer ? ⌛
I've fixed the unit, should be ok to merge :)