Cleaner magic numbers
Refactored timer handler; new sync recovery strategy