Readme update

Readme update and some fixes