Added TODO, minor changes