Some minor changes, and added a TODO document.