Minor design and other changes