Settlement Changes

Did some modifications on settlement