More shit. Fixed some DB stuff