design and db tweaks