Fix and docs