Made a few small changes