adding support to blacklist and fixing bugs