Updates

The latest updates from Jenson T.