added a probably useless type annotation, clarified doneness checker
moved templates away, corrected silly spelling mistake