Fixed readme and replace issues