Follow new conventions, fixed typos and infos