Small Fixes

- HTML attributes should now have consistent white spaces.

- HTML output should now include the calling node instead of
  omitting it.