improved outputs and comments