Merge additions and changes.

Merge with version kept in dropbox.