fixed some timings