Adjusted a couple pieces of logic, and removed debugging print statements.