Tweaked a few minor things