removed small mistakes
added a templatebuilder for a whole file and fixed some minor mistakes