#88 lots of minor fixing, spaces etc.