fix and doc