Lots of minor changes here and there.