fix some little questions