Better documentation and --remote option