Full update to latest code.

Some previous commits were not sync'ed with GitHub. This should bring
the project up to date.