Corrections and improvements to design.