332 Temp facelift, overall makeover.

Can't figure out why a measurement would slow down.  Still need to look
at that and maybe do one more test run.