Fixes and edits
Refrain from magic in-place reindexing
Add --magic option to do in-place reindexing
Edit warnings, add docstring