#1 minor design updates