more updates, added whitelist/blacklist helpers to some mode markers