more tuning for heuristics

I wish I had time to implement those robustly using attachments