README and some fixes