minor design upgrades #2