Fixing some bugs
Modified README