fix general timing errors and issues