more small fixs