minor tweaks.  still not fast.