mongoDB added, plus some cosmetic changes