some smalls modifs