Added icons.  Bug fixing in the output routine