speed fixes
indexes