More fixes, updates, and upgrades.