fix timing type, some other changes, still cant see if timings work or not