Trivial debug updates
Strip lines pre-match, update exception messaging, matching refactor