Timeline minor changes, added test remained which should improve reliability in low FPS situations
i++ to ++i