minor changes mostly spacing