Added TODO's, minor changes

Added TODO's, minor changes