Added DatebaseCompleten, fixed some bugs