more changes made to database structure, hopefully the last time...