Made some nice adjustments