Fix/improve -s/-e and -Q options