fix some little problems