Explore tool bug fix and refactoring.
Continuous goto.