Add DB user and minor tweaks