minor cleanup and a couple bug fixes
minor cleanup and a bug ifx (somehow lost adding the modules to the loaded set...)
Merge pull request #12 from rsby/master

a couple bugs fixes for multiple qualifiers and auto-loading and various minor cleanup