design and data tweaks