Tweaked some things here and there.