fix many proposal changes