whitespace
more small fixes