Many minor tweaks to the design.