some stragglers from the last commit