fixed questions order and added missing questions