minor changes added missing optional template vars required