Fixed a lame bug, some stuff left from the initial testing environment