Significant updates and fixes.