A bunch of design improvements.