updates and fixs