* rolling back the database simplifications
* few tweaks