added remarks about todos