#151 Various smaller fixes, mostly whitespace