a few bug fixes + better handling of blacklisted zones