some fix after review