needs a test suite but putatively fixes some bugs
fixing whitespace again again again
Merge commit 'fc1c6fd'