A lot of minor adjustments