Updated readme

and other changes