General improvements to the design