fixes all
update Readme
merge