fixed delay parsing bug & added better restartability