A few consistency changes

Lol.
The last consistency change.

Hey!