Added more output and some additional flags
Added better checking of qualifiers and fixed some bugs related to matching identifiers

Along the way, I added the ability to specify optional qualifiers as well.
Added a bunch of tests that should generate issues but not initially