some reorg and added glog