Edits

Edited history, added error catching to index, changed cosmetics in
tests