even moar fixes for whitespace