Bug fixes on additional questions