Fix accelerating timer and other bugs