mass various improvment update