Fix bug and improve Authors/Maintainer display