Untested changes

Most of these were tested some were not