Add template questions, remove some outdated stuff.