Made a few changes.