misc fixes while testing ofc and wkhtml
Merge pull request #947 from dlobo/FormattingFixes

misc fixes while testing ofc and wkhtml