Improved restore() capability and test.

Also updated lib/setup.py and MANIFEST.in