More cleanup
Additional cleanup. Added limits to dispatcher Tick()