george's changes
revert a couple reversions and document issues