Added TODO on several things. Other minor changes.