trailing spaces, minor changes