Added questionlist and fixed up some bugs