update doc & some fixes