More tweaks.  It's basically doing something useful now.