try to fill in some gaps [ci skip]