refactorings
Added some indexes
Some changes...dunno