More indexing
Fixes and new database