updated some links and order of questions