Further edits and typography improvements