Fixed some bugs related to my reorg of the everything file.  Seems to work.