Bug fixing and updated README