timing fixes and thelike