Various improvements
Readme fix