Fixed few bugs and updated README