Improved comand-line help
Improved error reporting