Improve sweep speed\robustness and bug fixes

Signed-off-by: Gray Remlin <gryrmln@gmail.com>