Added Blacklist and fixed Bugs