style and typos, mostly