Tweaked things here and there.