Tweaked some stuff a bit.