Minor edits

Minor edits all around. Heuristic 2 is still pending