design and other fixes