Fixed timer & various bugs. The ts part is more or less already a good dropin replacement.