Made a few minor adjustments