Fixed a couple things from my last