more design improvements