improvments on heuristic
removing debug options