make some minor design improvements