Contains fixes.
Modified: db interaction fixed