Made a couple tweaks, and maybe made things better.