New questions and minor tweaks