more todo altering

need to move these to github issues