extends merged descriptor, pinf env vars; misc fixes