Fixed a couple of things... I guess
Test