fix a lot, typos, etc.