some small fixs