A bunch of design refinements and improvements