fixed some private todo's