some more fixs