Updated README and small fixes