Finally Fixed Database Issues