I think I have the upgrade issues resolved.

Hopefully now the comments will work!