various minor revisions [ci skip]