couple bug fixes, added blacklist