added debug things
fixed db failure
fixed db failure
Merge origin/master