blindly made some updates on the white- and blacklists. Partially dummy code. Unable to test right now since I am offline.