minor adjustments
further minor adjustments