More updates to code and outputs