- add new heuristics, correct bugs