Reconciliation major fixes and improvements