Tweaked a few minor variables