various calibration refinements. Almost have a functional admin interface.