More updates and fixes