mix & documentation upgrade