database schema change and other tweaks