Fix and update docs and man