remote option; and better defaults merging