Ok, pass-count is actually fixed now. Better bounds checking and a + should have been a -.