Fix factor calculation, make clicking more automated