spaces and utf8 niceties

Change-Id: Ia75b98a7a7484d6dbf9a8587d40eb750795da158