added to blacklist and some regex messing around