Couple of bugs fixed, some potential breakpoints annotated.
Guess that's enough for today.