Couple regex fixes, unmatched line collection
Lots more regex work