added TODO plans, and some comments