updates and fixex