550 db fixes and 670 db additions (3rd attemp)