Updated index
Solving bugs