Fixed some things I had just for testing!