More updates and changes.