Upgrade and fixes.
Readme updated.