Added many to-do notes.

- Also some minor corrections