Design and other fixes