Better error reporting and command lines
Tiny changes
Merge