Four commit

fix