Accidental problems fixed.  Sorry for all the commits.