1) Updated README file
2) Some fixes