More updates and formatting