Tons of minor design improvements