seperate mongo and error
Merge branch 'dev'