fixed whitespace
misc updates