new new heuristic
minor fixes