update readme, fix few bugs