Updates

The latest updates from Ben Weekes.