design and ucd fixes