Q{15,16,17}, minor changes