Some minor design changes