Fixed print statements and added a TODO