several design updates