Added a few todo notes