updated README and some fixes