Fix minor things. Adjust docs after last changes.