Merge pull request #1 from mariush13/work

some changes
Merge pull request #2 from mariush13/work

fixes
db upgrade, output, first working version
almost full objective db queries