Multiple fixes, demo-data for db