fix small bugss