Improved output of invalid-arguments
Various fixes