Fix and Docs