please fix todo's