Fixed a LOT of minor errors