diff --git a/Gruntfile.js b/Gruntfile.js
index a223c8dcf..2678bf36c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -353,7 +353,7 @@ module.exports = function(grunt) {
     artifactory: {
       options: {
         url: artifactoryUrl,
-        repository: snapshotRepo, //releaseRepo,
+        repository: releaseRepo,
         username: artifactoryUser,
         password: artifactoryPassword
       },
@@ -364,7 +364,7 @@ module.exports = function(grunt) {
         options: {
           publish: [{
             id: groupId + ':ve:zip',
-            version: '3.6.1-SNAPSHOT',
+            version: '3.6.1',
             path: 'deploy/'
           }]
         }
diff --git a/app/js/mms/app.js b/app/js/mms/app.js
index a5d5292d6..75b6211ea 100644
--- a/app/js/mms/app.js
+++ b/app/js/mms/app.js
@@ -49,7 +49,7 @@ angular.module('mmsApp', ['mms', 'mms.directives', 'app.tpls', 'fa.directive.bor
 
     var mmsHost = window.location.protocol + '//' + window.location.host;
     URLServiceProvider.setMmsUrl(mmsHost);
-    //URLServiceProvider.setMmsUrl('https://opencae-uat.jpl.nasa.gov');
+    //URLServiceProvider.setMmsUrl('https://mms.openmbee.org');
 
     $httpProvider.defaults.withCredentials = true;
 // Check if user is logged in, if so redirect to select page otherwise go to login if the url isn't mapped
diff --git a/app/js/mms/controllers/toolbar.controller.js b/app/js/mms/controllers/toolbar.controller.js
index 67b03502a..a404dbf31 100644
--- a/app/js/mms/controllers/toolbar.controller.js
+++ b/app/js/mms/controllers/toolbar.controller.js
@@ -26,7 +26,7 @@ function($scope, $rootScope, $state, UxService, refOb, documentOb) {
         tbApi.addButton(UxService.getToolbarButton("element-history"));
         tbApi.addButton(UxService.getToolbarButton("tags"));
         // if ($state.includes('project.ref.document')) {
-            tbApi.addButton(UxService.getToolbarButton("jobs"));
+            //tbApi.addButton(UxService.getToolbarButton("jobs"));
         // }
         if ($state.includes('project.ref') && !$state.includes('project.ref.document')) {
             editable = documentOb._editable && refOb.type === 'Branch';
diff --git a/app/mms.html b/app/mms.html
index 08697f48f..80a050c44 100644
--- a/app/mms.html
+++ b/app/mms.html
@@ -11,7 +11,7 @@
     <!--endbuild-->
     <link rel="stylesheet" href="css/ve-mms.min.css" type="text/css">
     <link rel="stylesheet" href="lib/flatpickr/flatpickr.css" type="text/css">
-    <link href="/mms-ts/tsperspectives/TSWebView.css" rel="stylesheet" type="text/css">
+    <!--<link href="/mms-ts/tsperspectives/TSWebView.css" rel="stylesheet" type="text/css"> -->
     <link rel="icon" type="image/png" href="assets/favicon.png" />
     <link rel="icon" type="image/png" href="assets/favicon-32x32.png" sizes="32x32" />
     <link rel="icon" type="image/png" href="assets/favicon-16x16.png" sizes="16x16" />
diff --git a/app/partials/mms/pane-center.html b/app/partials/mms/pane-center.html
index 764d69462..b4a641891 100644
--- a/app/partials/mms/pane-center.html
+++ b/app/partials/mms/pane-center.html
@@ -5,9 +5,11 @@
                 <a type="button" class="btn btn-tools btn-sm" target="_blank" rel="noopener noreferrer" ng-href="{{docLibLink}}" uib-tooltip="Manage files" tooltip-placement="bottom" tooltip-popup-delay="100">
                     <img src="assets/alfresco-icon-sm.png">DocLib
                 </a>
+                <!--
                 <button type="button" class="btn btn-tools btn-sm share-url" ng-if="!ve_fn" ng-click="handleShareURL()" uib-tooltip="Share Page" tooltip-placement="bottom" tooltip-popup-delay="100"
                 popover-trigger="outsideClick" uib-popover-template="dynamicPopover.templateUrl" popover-title="{{dynamicPopover.title}}" popover-placement="bottom-left">
                 <i class="fa fa-share-alt"></i></button>
+                -->
             </div>
             <div class="pane-center-btn-group">
                 <mms-button-bar buttons="buttons" mms-bb-api="bbApi" class="bordered-button-bar"></mms-button-bar>
diff --git a/app/partials/mms/veNav.html b/app/partials/mms/veNav.html
index e38ea9aa8..7fa663ddb 100644
--- a/app/partials/mms/veNav.html
+++ b/app/partials/mms/veNav.html
@@ -24,7 +24,7 @@
                 </div>
             </form>
             <ul class="nav navbar-nav global-menu">
-                <!--<li><span><a ng-click="stagingView()">UAT</a></span></li>-->
+                
                 <li class="dropdown">
                     <span class="dropdown ve-dark-dropdown-nav fixed-content-dropdown" uib-dropdown on-toggle="toggled(open)">
                         <a href id="help-dropdown" class="dropdown-toggle" uib-dropdown-toggle>
@@ -36,10 +36,10 @@
                             </li>
                             <li class="divider"></li>
                             <li>
-                                <a href="https://wiki.jpl.nasa.gov/display/opencae/View+Editor+User+Guide" target="_blank">View Editor User Guide</a>
+                                <a href="https://github.com/Open-MBEE/ve/blob/develop/Documents/ViewEditorUserGuide.pdf" target="_blank">View Editor Help</a>
                             </li>
                             <li>
-                                <a href="https://jira.jpl.nasa.gov/servicedesk/customer/portal/5" target="_blank">Report Issue</a>
+                                <a href="https://openmbee.atlassian.net/secure/Dashboard.jspa" target="_blank">Report Issue</a>
                             </li>
                             <li class="divider"></li>
                             <li class="list-section-bottom">
diff --git a/src/directives/mmsCkEditor.js b/src/directives/mmsCkEditor.js
index 373f97e7d..ccf34e16b 100644
--- a/src/directives/mmsCkEditor.js
+++ b/src/directives/mmsCkEditor.js
@@ -340,7 +340,7 @@ function mmsCkeditor($uibModal, $templateCache, $timeout, growl, CKEDITOR, _, Ca
         };
         
         // Formatting editor toolbar
-        var stylesToolbar = { name: 'styles', items : ['Format','FontSize','TextColor','BGColor' ] };
+        var stylesToolbar = { name: 'styles', items : ['Styles',/*'Format',*/'FontSize','TextColor','BGColor'] };
         var basicStylesToolbar = { name: 'basicstyles', items : [ 'Bold','Italic','Underline', 'mmsExtraFormat'] };
         var clipboardToolbar = { name: 'clipboard', items : [ 'Undo','Redo' ] };
         var justifyToolbar = { name: 'paragraph', items : [ 'JustifyLeft','JustifyCenter','JustifyRight' ] };
diff --git a/src/directives/mmsTranscludeDoc.js b/src/directives/mmsTranscludeDoc.js
index a180f81aa..7d59025c2 100644
--- a/src/directives/mmsTranscludeDoc.js
+++ b/src/directives/mmsTranscludeDoc.js
@@ -44,6 +44,9 @@ function mmsTranscludeDoc(Utils, ElementService, UtilsService, ViewService, UxSe
     var fixPreSpanRegex = /<\/span>\s*<mms-cf/g;
     var fixPostSpanRegex = /<\/mms-cf>\s*<span[^>]*>/g;
     var emptyRegex = /^\s*$/;
+    var spacePeriod = />(?:\s|&nbsp;)\./g;
+    var spaceSpace = />(?:\s|&nbsp;)(?:\s|&nbsp;)/g;
+    var spaceComma = />(?:\s|&nbsp;),/g;
 
     var mmsTranscludeDocCtrl = function($scope) {
 
@@ -93,6 +96,9 @@ function mmsTranscludeDoc(Utils, ElementService, UtilsService, ViewService, UxSe
             }
             doc = doc.replace(fixPreSpanRegex, "<mms-cf");
             doc = doc.replace(fixPostSpanRegex, "</mms-cf>");
+            doc = doc.replace(spacePeriod, '>.');
+            doc = doc.replace(spaceSpace, '> ');
+            doc = doc.replace(spaceComma, '>,');
             if (preview) {
                 domElement[0].innerHTML = '<div class="panel panel-info">'+doc+'</div>';
             } else {
diff --git a/src/directives/mmsTranscludeVal.js b/src/directives/mmsTranscludeVal.js
index 54c5ec68a..7cb36480f 100644
--- a/src/directives/mmsTranscludeVal.js
+++ b/src/directives/mmsTranscludeVal.js
@@ -39,6 +39,9 @@ function mmsTranscludeVal(ElementService, UtilsService, UxService, Utils, URLSer
     var frameTemplate = $templateCache.get('mms/templates/mmsTranscludeValFrame.html');
     var editTemplate = $templateCache.get('mms/templates/mmsTranscludeValEdit.html');
     var emptyRegex = /^\s*$/;
+    var spacePeriod = />(?:\s|&nbsp;)\./g;
+    var spaceSpace = />(?:\s|&nbsp;)(?:\s|&nbsp;)/g;
+    var spaceComma = />(?:\s|&nbsp;),/g;
 
     var mmsTranscludeCtrl = function ($scope, $rootScope) {
 
@@ -119,6 +122,9 @@ function mmsTranscludeVal(ElementService, UtilsService, UxService, Utils, URLSer
                     domElement[0].innerHTML = '<span class="no-print placeholder">(no value)</span>';
                     return;
                 }
+                toCompile = toCompile.replace(spacePeriod, '>.');
+                toCompile = toCompile.replace(spaceSpace, '> ');
+                toCompile = toCompile.replace(spaceComma, '>,');
                 if (preview) {
                     domElement[0].innerHTML = '<div class="panel panel-info">'+toCompile+'</div>';
                 } else {
diff --git a/src/directives/mmsTree.js b/src/directives/mmsTree.js
index f34f1f6a6..a79595a77 100644
--- a/src/directives/mmsTree.js
+++ b/src/directives/mmsTree.js
@@ -351,6 +351,7 @@ function mmsTree(ApplicationService, $timeout, $log, $templateCache, $filter, Ut
                     children: branch.children
                 });
                 if (branch.children) {
+                    var alpha = false;
                     if (scope.options.sort) {
                         branch.children.sort(scope.options.sort);
                     }
@@ -366,8 +367,12 @@ function mmsTree(ApplicationService, $timeout, $log, $templateCache, $filter, Ut
                             add_branch_to_list(level + 1, section, branch.children[i], child_visible, peNums);
                         } else {
                             if (scope.options.sectionNumbering) {
+                                if (branch.children[i].data._isAppendix) {
+                                    alpha = true;
+                                    j = 0;
+                                }
                                 var nextSection = section.slice(); 
-                                nextSection.push(j);
+                                nextSection.push(alpha ? String.fromCharCode(j + 65) : j);
                                 if (nextSection.length <= scope.options.numberingDepth) {
                                     peNums.table = 0; peNums.figure = 0; peNums.equaton = 0;
                                 }
diff --git a/src/directives/mmsViewLink.js b/src/directives/mmsViewLink.js
index a0e95973c..82ba46ee2 100644
--- a/src/directives/mmsViewLink.js
+++ b/src/directives/mmsViewLink.js
@@ -75,7 +75,7 @@ function mmsViewLink(ElementService, UtilsService, $compile, growl, ViewService,
             .then(function(data) {
                 scope.element = data;
                 scope.name = data.name;
-                scope.type = 'Section ';
+                scope.type = 'Clause ';
                 scope.suffix = '';
                 scope.hash = '#' + data.id;
                 if (scope.mmsPeId && scope.mmsPeId !== '') {
@@ -92,13 +92,33 @@ function mmsViewLink(ElementService, UtilsService, $compile, growl, ViewService,
                         } else if (ViewService.isEquation(pe)) {
                             scope.type = "Eq. (";
                             scope.suffix = ')';
+                        } else if (ViewService.isSection(pe)) {
+                            scope.type = '';
                         }
                         if (ApplicationService.getState().fullDoc) {
                             scope.href = UtilsService.PROJECT_URL_PREFIX + scope.projectId + '/' + scope.refId + '/documents/' + scope.docid + "/full" + scope.hash;
                         } else {
                             scope.href = UtilsService.PROJECT_URL_PREFIX + scope.projectId + '/' + scope.refId + '/documents/' + scope.docid + '/views/' + scope.vid + scope.hash;
                         }
+                    }, function() {
+                        if (data._veNumber) {
+                            var numbers = data._veNumber.split('.');
+                            if (numbers.length > 1) {
+                                scope.type = '';
+                            } else if (isNaN(parseInt(numbers[0]))) {
+                                scope.type = 'Annex ';
+                            }
+                        }
                     });
+                } else {
+                    if (data._veNumber) {
+                        var numbers = data._veNumber.split('.');
+                        if (numbers.length > 1) {
+                            scope.type = '';
+                        } else if (isNaN(parseInt(numbers[0]))) {
+                            scope.type = 'Annex ';
+                        }
+                    }
                 }
                 if (UtilsService.isDocument(data)) {
                     docid = data.id;
@@ -114,6 +134,11 @@ function mmsViewLink(ElementService, UtilsService, $compile, growl, ViewService,
                     element.html("<span class=\"mms-error\">view link doesn't refer to a view</span>");
                 }
                 scope.loading = false;
+                //for omg doc - if we're in a doc, just assume the link is within current doc
+                if (ApplicationService.getState().inDoc) {
+                    scope.docid = ApplicationService.getState().currentDoc;
+                }
+                //end omg specific fix
                 if (ApplicationService.getState().fullDoc) {
                     scope.href = UtilsService.PROJECT_URL_PREFIX + scope.projectId + '/' + scope.refId + '/documents/' + scope.docid + '/full' + scope.hash;
                 } else {
diff --git a/src/lib/ckeditor/config.js b/src/lib/ckeditor/config.js
index 9b8c8d934..aa7062573 100644
--- a/src/lib/ckeditor/config.js
+++ b/src/lib/ckeditor/config.js
@@ -15,7 +15,7 @@ CKEDITOR.editorConfig = function( config ) {
 	//config.tabSpaces = 4;
 	//config.height = 350;
 	// config.extraPlugins = 'autosave,iframe,mediaembed,embed,
-	config.extraPlugins = 'liststyle,colordialog,autosave,autogrow,mmscf,mmscomment,mmsvlink,mmsreset,mmssignature,mmsdropdown';
+	config.extraPlugins = 'liststyle,colordialog,autosave,autogrow,stylescombo,mmscf,mmscomment,mmsvlink,mmsreset,mmssignature,mmsdropdown';
     config.autoGrow_minHeight = 200;
     config.autoGrow_maxHeight = 600;
     config.autoGrow_bottomSpace = 50;
@@ -40,4 +40,16 @@ CKEDITOR.editorConfig = function( config ) {
 
 	// Simplify the dialog windows.
 	config.removeDialogTabs = 'image:advanced;link:advanced';
+
+	config.stylesSet = [
+		{ name: 'Paragraph',		element: 'p' },
+		{ name: 'Heading 1',		element: 'h1' },
+		{ name: 'Heading 2',		element: 'h2' },
+		{ name: 'Heading 3',		element: 'h3' },
+		{ name: 'Heading 4',		element: 'h4' },
+		{ name: 'Heading 5',		element: 'h5' },
+		{ name: 'Heading 6',		element: 'h6' },
+		{ name: 'Preformatted Text',element: 'pre' },
+		{ name: 'Computer Code',	element: 'code' }
+	];
 };
diff --git a/src/lib/ckeditor/plugins/stylescombo/lang/en.js b/src/lib/ckeditor/plugins/stylescombo/lang/en.js
new file mode 100644
index 000000000..c051b4398
--- /dev/null
+++ b/src/lib/ckeditor/plugins/stylescombo/lang/en.js
@@ -0,0 +1,11 @@
+/*
+Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+*/
+CKEDITOR.plugins.setLang( 'stylescombo', 'en', {
+	label: 'Styles',
+	panelTitle: 'Formatting Styles',
+	panelTitle1: 'Block Styles',
+	panelTitle2: 'Inline Styles',
+	panelTitle3: 'Object Styles'
+} );
diff --git a/src/lib/ckeditor/plugins/stylescombo/plugin.js b/src/lib/ckeditor/plugins/stylescombo/plugin.js
new file mode 100644
index 000000000..4b84f57b6
--- /dev/null
+++ b/src/lib/ckeditor/plugins/stylescombo/plugin.js
@@ -0,0 +1,205 @@
+/**
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+ */
+
+( function() {
+	'use strict';
+
+	CKEDITOR.plugins.add( 'stylescombo', {
+		requires: 'richcombo',
+		// jscs:disable maximumLineLength
+		lang: 'af,ar,az,bg,bn,bs,ca,cs,cy,da,de,de-ch,el,en,en-au,en-ca,en-gb,eo,es,es-mx,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,oc,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,tt,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE%
+		// jscs:enable maximumLineLength
+
+		init: function( editor ) {
+			var config = editor.config,
+				lang = editor.lang.stylescombo,
+				styles = {},
+				stylesList = [],
+				combo,
+				allowedContent = [];
+
+			editor.on( 'stylesSet', function( evt ) {
+				var stylesDefinitions = evt.data.styles;
+
+				if ( !stylesDefinitions )
+					return;
+
+				var style, styleName, styleType;
+
+				// Put all styles into an Array.
+				for ( var i = 0, count = stylesDefinitions.length; i < count; i++ ) {
+					var styleDefinition = stylesDefinitions[ i ];
+
+					if ( editor.blockless && ( styleDefinition.element in CKEDITOR.dtd.$block ) ||
+						( typeof styleDefinition.type == 'string' && !CKEDITOR.style.customHandlers[ styleDefinition.type ] ) ) {
+
+						continue;
+					}
+
+					styleName = styleDefinition.name;
+					style = new CKEDITOR.style( styleDefinition );
+
+					if ( !editor.filter.customConfig || editor.filter.check( style ) ) {
+						style._name = styleName;
+						style._.enterMode = config.enterMode;
+						// Get the type (which will be used to assign style to one of 3 groups) from assignedTo if it's defined.
+						style._.type = styleType = style.assignedTo || style.type;
+
+						// Weight is used to sort styles (https://dev.ckeditor.com/ticket/9029).
+						style._.weight = i + ( styleType == CKEDITOR.STYLE_OBJECT ? 1 : styleType == CKEDITOR.STYLE_BLOCK ? 2 : 3 ) * 1000;
+
+						styles[ styleName ] = style;
+						stylesList.push( style );
+						allowedContent.push( style );
+					}
+				}
+
+				// Sorts the Array, so the styles get grouped by type in proper order (https://dev.ckeditor.com/ticket/9029).
+				stylesList.sort( function( styleA, styleB ) {
+					return styleA._.weight - styleB._.weight;
+				} );
+			} );
+
+			editor.ui.addRichCombo( 'Styles', {
+				label: lang.label,
+				title: lang.panelTitle,
+				toolbar: 'styles,10',
+				allowedContent: allowedContent,
+
+				panel: {
+					css: [ CKEDITOR.skin.getPath( 'editor' ) ].concat( config.contentsCss ),
+					multiSelect: true,
+					attributes: { 'aria-label': lang.panelTitle }
+				},
+
+				init: function() {
+					var style, styleName, lastType, type, i, count;
+
+					// Loop over the Array, adding all items to the
+					// combo.
+					for ( i = 0, count = stylesList.length; i < count; i++ ) {
+						style = stylesList[ i ];
+						styleName = style._name;
+						type = style._.type;
+
+						if ( type != lastType ) {
+							this.startGroup( lang[ 'panelTitle' + String( type ) ] );
+							lastType = type;
+						}
+
+						this.add( styleName, style.type == CKEDITOR.STYLE_OBJECT ? styleName : style.buildPreview(), styleName );
+					}
+
+					this.commit();
+				},
+
+				onClick: function( value ) {
+					editor.focus();
+					editor.fire( 'saveSnapshot' );
+
+					var style = styles[ value ],
+						elementPath = editor.elementPath();
+
+					// When more then one style from the same group is active ( which is not ok ),
+					// remove all other styles from this group and apply selected style.
+					if ( style.group && style.removeStylesFromSameGroup( editor ) ) {
+						editor.applyStyle( style );
+					} else {
+						editor[ style.checkActive( elementPath, editor ) ? 'removeStyle' : 'applyStyle' ]( style );
+					}
+
+					editor.fire( 'saveSnapshot' );
+				},
+
+				onRender: function() {
+					editor.on( 'selectionChange', function( ev ) {
+						var currentValue = this.getValue(),
+							elementPath = ev.data.path,
+							elements = elementPath.elements;
+
+						// For each element into the elements path.
+						for ( var i = 0, count = elements.length, element; i < count; i++ ) {
+							element = elements[ i ];
+
+							// Check if the element is removable by any of
+							// the styles.
+							for ( var value in styles ) {
+								if ( styles[ value ].checkElementRemovable( element, true, editor ) ) {
+									if ( value != currentValue )
+										this.setValue( value );
+									return;
+								}
+							}
+						}
+
+						// If no styles match, just empty it.
+						this.setValue( '' );
+					}, this );
+				},
+
+				onOpen: function() {
+					var selection = editor.getSelection(),
+						// When editor is focused but is returned `null` as selected element, then return editable (#646).
+						// In case when selection dosen't cover whole element, we try to return element where selection starts (#862).
+						element = selection.getSelectedElement() || selection.getStartElement() || editor.editable(),
+						elementPath = editor.elementPath( element ),
+						counter = [ 0, 0, 0, 0 ];
+
+					this.showAll();
+					this.unmarkAll();
+					for ( var name in styles ) {
+						var style = styles[ name ],
+							type = style._.type;
+
+						if ( style.checkApplicable( elementPath, editor, editor.activeFilter ) )
+							counter[ type ]++;
+						else
+							this.hideItem( name );
+
+						if ( style.checkActive( elementPath, editor ) )
+							this.mark( name );
+					}
+
+					if ( !counter[ CKEDITOR.STYLE_BLOCK ] )
+						this.hideGroup( lang[ 'panelTitle' + String( CKEDITOR.STYLE_BLOCK ) ] );
+
+					if ( !counter[ CKEDITOR.STYLE_INLINE ] )
+						this.hideGroup( lang[ 'panelTitle' + String( CKEDITOR.STYLE_INLINE ) ] );
+
+					if ( !counter[ CKEDITOR.STYLE_OBJECT ] )
+						this.hideGroup( lang[ 'panelTitle' + String( CKEDITOR.STYLE_OBJECT ) ] );
+				},
+
+				refresh: function() {
+					var elementPath = editor.elementPath();
+
+					if ( !elementPath )
+						return;
+
+					for ( var name in styles ) {
+						var style = styles[ name ];
+
+						if ( style.checkApplicable( elementPath, editor, editor.activeFilter ) )
+							return;
+					}
+					this.setState( CKEDITOR.TRISTATE_DISABLED );
+				},
+
+				// Force a reload of the data
+				reset: function() {
+					if ( combo ) {
+						delete combo._.panel;
+						delete combo._.list;
+						combo._.committed = 0;
+						combo._.items = {};
+						combo._.state = CKEDITOR.TRISTATE_OFF;
+					}
+					styles = {};
+					stylesList = [];
+				}
+			} );
+		}
+	} );
+} )();
diff --git a/src/services/UtilsService.js b/src/services/UtilsService.js
index 9e9f0530e..2285b9967 100644
--- a/src/services/UtilsService.js
+++ b/src/services/UtilsService.js
@@ -816,7 +816,7 @@ function UtilsService($q, $http, CacheService, URLService, ApplicationService, _
         var cap = '';
         var name = '';
         if (child.type === 'table') {
-            //ob.tableCount++;
+            ob.tableCount++;
             prefix = 'Table ' + veNumber + '. ';
             var capTbl = el.find('table > caption');
             name = capTbl.text();
@@ -842,7 +842,7 @@ function UtilsService($q, $http, CacheService, URLService, ApplicationService, _
             refs.filter('[suppress-numbering!="true"]').filter(':not([link-text])').find('a').html('Table ' + cap);
         }
         if (child.type === 'figure') {
-            //ob.figureCount++;
+            ob.figureCount++;
             prefix = 'Figure ' + veNumber + '. ';
             var capFig = el.find('figure > figcaption');
             name = capFig.text();
@@ -868,7 +868,7 @@ function UtilsService($q, $http, CacheService, URLService, ApplicationService, _
             refs.filter('[suppress-numbering!="true"]').filter(':not([link-text])').find('a').html('Fig. ' + cap);
         }
         if (child.type === 'equation') {
-            //ob.equationCount++;
+            ob.equationCount++;
             cap = veNumber + '. ' + pe.name;
             ob.equations += '<li><a href="#' + sysmlId + '">' + cap + '</a></li>';
             var equationCap = '(' + veNumber + ')';
@@ -1136,7 +1136,8 @@ function UtilsService($q, $http, CacheService, URLService, ApplicationService, _
                 "3. Typography\n" +
                 "------------------------------------------------------------------*/\n" +
                 "h1, h2, h3, h4, h5, h6 {font-family: 'Arial', sans-serif; margin: 10px 0; page-break-inside: avoid; page-break-after: avoid;}\n" +
-                "h1 {font-size: 18pt;} h2 {font-size: 16pt;} h3 {font-size: 14pt;} h4 {font-size: 13pt;} h5 {font-size: 12pt;} h6 {font-size: 11pt;}\n" +
+                //"h1 {font-size: 18pt;} h2 {font-size: 16pt;} h3 {font-size: 14pt;} h4 {font-size: 13pt;} h5 {font-size: 12pt;} h6 {font-size: 11pt;}\n" +
+                ".h1 {font-size: 18pt;} .h2 {font-size: 14pt;} .h3 {font-size: 12pt;} .h4 {font-size: 10pt;} .h5, .h6, .h7, .h8, .h9 {font-size: 9pt;}\n" +
                 ".ng-hide {display: none;}\n" +
                 ".chapter h1.view-title {font-size: 20pt; }\n" + 
                 "body {font-size: 10pt; font-family: 'Times New Roman', Times, serif; }\n" + 
@@ -1224,7 +1225,7 @@ function UtilsService($q, $http, CacheService, URLService, ApplicationService, _
                 } else {
                     content = '"' + meta[key] + '"';
                 }
-                ret += '@page {@' + key + ' {font-size: 10px; content: ' + content + ';}}\n';
+                ret += '@page {@' + key + ' {font-size: 9px; content: ' + content + ';}}\n';
             }
         });
         if (landscape) {