Added heuristics, better consistency-check, also gives the time!