Updates and some daig stuff.

Sigh.
Merge pull request #1 from tneville/master

Updates and some daig stuff.