more conventions, more typos fixed