various fixes + readme.md