Updated printing and comments