Updated readme.rst & some fixes