Dispatcher bug fixes, Timer functionality overhauled