Timing issues

Fixed a lot of timing issues