Bunch of minor changes.