add db
remove db
a bit improvments
improme services