Minor bug fixes and adding more questions.