And some documentation fixes