Woot...

Okay, going to push this out.
Quick tweaks
Updated! Blegh.