More question generators + updated questions