cleaned up database structure, more indexes added