Corrected some delay issues