more base URI handling, switched to --version 2 as default