Bumpers + secondary heuristic added, hash function fixed