Add indexes, method cleanup
README updated, restore state/pid