addition options description and changes to the templates