Add graphics and fix some output