Update to remove ORCID update bug work around.  Also fixed some bugs and
cleaned up code.