update #90 - some fixes, add blacklist