Many blacklists added and output formatting made more sane