Few fixes, and readme.
Rebase