latest fixes and hacks for timing