Fixed several timing issues!