some more todos [ci skip]