Extended buffer, tweaked delay handling, code clearing