General updates and adding output lines