Completed  Parsing corrections.
Tested across multiple intentionally contrived weird (or just plain wrong) patterns, all tests successful.
Ready to merge.
Rebuilt project
Merge branch 'feature/Fix_mixed_format_parsing_issues' into develop