#17, doc fixes