Revert "various things that did not update correctly on previous commits"

This reverts commit cd03d7b64e1ddbc30249ef572f622ac04f27001b.