Fix compare jump logic, and attempt to make code more readable

The many delay sections where making it difficult to read.
Attempted to make it more obvious when delay sections start and end.