Complete the README file and make few fixes