added questions and updated templates