Updates

The latest updates from Jason Rogers.