Made a few small adjustments