Various fixes; catch more bad questions into non-interrogative