cleaning up some weird edge cases and implementing the qualifier overrides