User keys can no longer be updated. Instead, they should be deleted and re-added.
this change also includes some additional minor code cleanup fixes #58