fixes and doc
fix merge