small typo fixes
add support for qualifiers