More updates to main program.