Add TODO comments and form summaries

* Add some comments and change control names to match conventions.