I have chosen the same topic so it was interesting to see a different take on what your perspective of characteristics of a good are. I believe that all of these qualities are important for a leader to have and I would be interested in getting to read your final project to compare it to mine. I thought that your thesis could use some work to make it sound more formal, but the structure is good. One source that could help you in your research is, " The Impact of Leader's Humor on Employees' Creativity:The Moderating Role of Trust in Leader." This article is about a study done to see how leaders having sence of humor effects how much their teams trust them.
https://lopes.idm.oclc.org/login?url=http://search.ebscohost.com/login.aspx?direct=true&db=bth&AN=108623807&site=eds-live&scope=site