whitespace and other fixes