adjusted comments and added template