several design upgrades