couple of design improvements