fix some small problems