more minor design changes