Get Brute Force to work, fix minor bugs, code cleanup