update readme and fix few bugs