Updated readme and correct some messages