Fixes and upgrades.