added descriptions to options and added a template option where necessary