Improve templates and finish findDiff game