Better error reporting MBL-500
better support for bash completion