Lots of minor design adjustments