You tricky &nbsp;s... Fixes #224

Also some actual whitespace changes. #224.