various design improvements per #11540