Some last minor design changes