fixed dependencies and added indices