various design improvements