few bug fixes. And readme modification