future: some minor adjustments