Bug fixes to DB queries and slight changes before launch.