notes and fixes [ci skip]