minor design improvements