some minor design changes