Develop

Updated comments and template naming