revert a couple reversions and document issues