Fix whitespace
Begin working on HTML output