pass CLI opts to context, minor changes.