Tidy up config display, make gDischarge 0 based