Buff up TODO comments - change name, add more thoughts
Fix bugs; now runs.