minor changes
db merged