removed some bugs, renaming database members from tree view temporarily
out of order