Adding comments to DB functions
Fixed merge conflicts