more doc
update tofix
fix merge