Fixed a few things here and over there!

*Looks into the abyss*