Miscellaneous additions
Solution to the indexing problem.