Add README.md and some fixes