correcting square wave estimate across timesteps was a bad idea.  This seems to be working much better.  Also, the direct cal technique seems to be flawed so utilized maximum magnitude across observations to equalize the cal data and that seems to have fixed some things as well...