Edit definition of -Q and --batch options
Improve documentation