Derp, actually implement the changes

More language cleanup and set it to false