Bunch of minor and major language fixes
Revert "Bunch of minor and major language fixes"

This reverts commit 33434c301390b68d2886bf4ad57c847ea41e5308.
Fixed a bunch of minor and major language issues