Lots of tweaks that make the what/which+noun questions all work, plus corrected a few ancient typos I noticed