-Fixed some more timing bugs