More updates and changes