Add support for widerange bans, start fixing masking