Minor improvements for new design