design and minor upgrades