Updated Database

Should be complete. No more changes:)