Made a few changes