Added #20, fixed #21, removed few things

I've removed OnlyCountOutside/OnlyCountOutsideBlackList - it wasn't very
useful or needed, and code was very confusing