More updates and fixes.