Added --remote option.
Cleanup.