design and structure fixes