README and some improvements