Split/add and fixes

What's up w/ this? `qualifiers` != `kwargs`, right?