Added TODO and some minor changes