petewarden Tweaked display formats, removed debug logging