DATABASE STILL NOT READY TO GO -- minor changes to database stuff