Clarify differences between conventions; solve some little typos