general design improvements