Fixes of references and style