fixed minor things..
Merge pull request #37 from ipa-fxm-db/experimental_branch

fixed minor things..