new questions and minor tweaks