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