Various additions.
Finished first draft.