tiny branding fix
improve usage
improve error handling in one-shot mode