some work on finishing heuristics implementation