Fix little nitpicky stuff and add better evaluation function