More tweaks.  I'm tired.