More minor changes to design