Regex fixes
Debug printing cleanup