Adjusted a couple things, removed debugging puts