add some manual edits to make things a little more sane