Some fixes + Settlement detail