More TODO's
Fixed print message
More TODO's