fixed some whitespace handling