milToGridlab reconciliation before merge, misc cleanup.