Add index.
Bug 131.
Misc. fixes and additions.
Add methods.
Add methods.