Made a couple of minor changes