added white and black lists and fixed bugs
added white and black lists and fixed bugs