Updates

The latest updates from Daniel Truman.