Some fixes, and updated the README file