Made adjustments to get rid of bad questions and fix #41