several fix an update