Made a few minor changes